Search results

@i3m/conflict-resolver-service

The Conflict-Resolver Service (CSR) can be queried to provide a signed resolution about the non-repudiation protocol associated to an invoice being valid or invalid. It could be invoked by either the consumer or the provider. It is a core element of the C

• crs
• conflict resolution
• conflict
• non-repudiation
• i3-MARKET
• i3m

juanelasisme

published 1.3.0 • a year agopublished 1.3.0 a year ago

sickmerge

A git command-line conflict resolution tool. In the browser.

• sickmerge
• git
• merge
• conflict
• command-line
• code-mirror
• resolution

jgriffith

published 0.0.3 • 10 years agopublished 0.0.3 10 years ago

herm-js-document

Herm-js document system for offline sync, and auto conflict resolution.

• herm-js
• javascript
• framework
• data
• sync
• conflict
• progressive
• apps
• offline

azukaar

published 0.3.5 • 6 years agopublished 0.3.5 6 years ago

git-conflicts

Manual merge tool

• git
• merge
• tool
• mergetool
• rebase
• marker
• conflict
• resolution
• editor

eush77

published 1.5.0 • 7 years agopublished 1.5.0 7 years ago